Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 14 Jul 2010 22:46:23 +0000 (22:46 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 14 Jul 2010 22:46:23 +0000 (22:46 +0000)
commit6fa379ffee1a8a5b4bf5d6f855a368ef6b31c9b5
treeb1c670f3447decf4c91b22363738aac28d06c9ec
parent9132dbe3419c35a077ac6379d5df6e0885d48ac3
parente1d88de46f31a6aeeb687b7e44aa742cd3eeea0e
Merge from mainline.